From e014f54523cffc19e8b2d05cda0e458df3756917 Mon Sep 17 00:00:00 2001 From: Max Semenik Date: Wed, 18 Aug 2010 19:28:41 +0000 Subject: [PATCH] Installer: use human-friendly list of databases, pass count of drivers for {{PLURAL}} --- includes/installer/Installer.i18n.php | 5 +++-- includes/installer/Installer.php | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/includes/installer/Installer.i18n.php b/includes/installer/Installer.i18n.php index 35324795ba..3bb4377031 100644 --- a/includes/installer/Installer.i18n.php +++ b/includes/installer/Installer.i18n.php @@ -95,7 +95,7 @@ The following database types are supported: $1. If you are on shared hosting, ask your hosting provider to install a suitable database driver. If you compiled PHP yourself, reconfigure it with a database client enabled, for example using ./configure --with-mysql. If you installed PHP from a Debian or Ubuntu package, then you also need install the php5-mysql module.', - 'config-have-db' => 'Found database drivers: $1.', + 'config-have-db' => 'Found database {{PLURAL:$2|driver|drivers}}: $1.', 'config-register-globals' => "'''Warning: PHP's [http://php.net/register_globals register_globals] option is enabled.''' '''Disable it if you can.''' MediaWiki will work, but your server is exposed to potential security vulnerabilities.", @@ -504,7 +504,8 @@ $messages['qqq'] = array( 'config-no-db-help' => 'Parameters: * $1 is comma separated list of supported database types by MediaWiki.', 'config-have-db' => 'Parameters: -* $1 is comma separated list of database drivers found in the application environment.', +* $1 is comma separated list of database drivers found in the application environment. +* $2 is the number of aforementioned drivers', 'config-memory-ok' => 'Parameters: * $1 is the configured memory_limit.', 'config-memory-raised' => 'Parameters: diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php index e401f57dda..471bd1a622 100644 --- a/includes/installer/Installer.php +++ b/includes/installer/Installer.php @@ -437,7 +437,7 @@ abstract class Installer { return false; } - $this->showMessage( 'config-have-db', $wgLang->commaList( $goodNames ) ); + $this->showMessage( 'config-have-db', $wgLang->listToText( $goodNames ), count( $goodNames ) ); } /** -- 2.20.1